diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index c85d926..64d3f9e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -18,14 +18,14 @@
 TARGET_NO_KERNEL := true
 TARGET_NO_RECOVERY := true
 
-BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_COPY_OUT_VENDOR := vendor
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := erofs
 TARGET_COPY_OUT_SYSTEM_EXT := system_ext
-BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs
 TARGET_COPY_OUT_PRODUCT := product
-BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs
 BOARD_USES_METADATA_PARTITION := true
 # Super partition
 TARGET_USE_DYNAMIC_PARTITIONS := true
diff --git a/fstab.common b/fstab.common
index f1bd034..8ad1f7b 100644
--- a/fstab.common
+++ b/fstab.common
@@ -1,8 +1,8 @@
-system		/system		ext4	noatime,ro,errors=panic		wait,logical,first_stage_mount,slotselect
+system		/system		erofs	ro				wait,logical,first_stage_mount,slotselect
 /dev/block/platform/soc@0/1d84000.ufshc/by-name/userdata /data		ext4	discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt	latemount,wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,quota
 /dev/block/platform/soc@0/1d84000.ufshc/by-name/metadata	/metadata	ext4	noatime,nosuid,nodev,discard					wait,formattable,first_stage_mount,check
 /dev/block/platform/soc@0/1d84000.ufshc/by-name/misc /misc emmc defaults defaults
 /devices/platform/soc@0/8804000.sdhci/mmc_host/mmc*	auto	auto	defaults	voldmanaged=sdcard1:auto
-vendor		/vendor		ext4	noatime,ro,errors=panic		wait,logical,first_stage_mount,slotselect
-system_ext	/system_ext	ext4	noatime,ro,errors=panic		wait,logical,first_stage_mount,slotselect
-product	/product	ext4	noatime,ro,errors=panic		wait,logical,first_stage_mount,slotselect
+vendor		/vendor		erofs	ro				wait,logical,first_stage_mount,slotselect
+system_ext	/system_ext	erofs	ro				wait,logical,first_stage_mount,slotselect
+product	/product	erofs	ro				wait,logical,first_stage_mount,slotselect